Autogenerated HTML docs for v2.34.0-rc1-14-g88d91
diff --git a/merge-options.txt b/merge-options.txt index 61ec157..d8f7cd7 100644 --- a/merge-options.txt +++ b/merge-options.txt
@@ -132,8 +132,9 @@ Only useful when merging. endif::git-pull[] ---no-verify:: - This option bypasses the pre-merge and commit-msg hooks. +--[no-]verify:: + By default, the pre-merge and commit-msg hooks are run. + When `--no-verify` is given, these are bypassed. See also linkgit:githooks[5]. ifdef::git-pull[] Only useful when merging.
